build: Also make gjs-based tests conditional on introspection support
authorColin Walters <walters@verbum.org>
Fri, 11 Oct 2013 15:50:15 +0000 (11:50 -0400)
committerColin Walters <walters@verbum.org>
Fri, 11 Oct 2013 16:04:24 +0000 (12:04 -0400)
Since they use imports.gi.OSTree.

configure.ac

index 20bc7d9a92a32f81a02d2e3300199f6b7181f84c..c0b43104392f5c05527ccbefb0550c85ef9400de 100644 (file)
@@ -79,7 +79,7 @@ AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno)
 m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [
   GOBJECT_INTROSPECTION_CHECK([1.34.0])
 ])
-AM_CONDITIONAL(BUILDOPT_INTROSPECTION, test x$found_introspection = xyes)
+AM_CONDITIONAL(BUILDOPT_INTROSPECTION, test "x$found_introspection" = xyes)
 
 LIBGPGME_DEPENDENCY="1.1.8"
 
@@ -154,12 +154,14 @@ AS_IF([test "x$with_dracut" = "xyes"], [
 ])
 
 dnl for tests
-AC_PATH_PROG(GJS, [gjs])
-if test -n "$GJS"; then
-  have_gjs=yes
-else
-  have_gjs=no
-fi
+AS_IF([test "x$found_introspection" = xyes], [
+  AC_PATH_PROG(GJS, [gjs])
+  if test -n "$GJS"; then
+    have_gjs=yes
+  else
+    have_gjs=no
+  fi
+], [have_gjs=no])
 AM_CONDITIONAL(BUILDOPT_GJS, test x$have_gjs = xyes)
 
 AC_CONFIG_FILES([